Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 13 Oct 2011 15:23:32 +0000 (08:23 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 13 Oct 2011 15:23:32 +0000 (08:23 -0700)
commit76535ec6c7cc1a18a4d29f474fc77100e909d681
tree0832645063a3353191a3499d7d38b43be2bd9365
parent85fdcd2c31ca9c732992592b94cb3e5c0fb96891
parent05de6b83cf61bf610575cc423ecdbce85381730c
Merge from trunk.
src/ChangeLog
src/bidi.c
src/editfns.c
src/xdisp.c